Reverting oldid parts of r18156 and r18150, as should not be taking 'oldid' out of...

E.g. outputs the wrong value here: http://en.wikipedia.org/w/index.php?title=Calcitriol&direction=next&oldid=71374766
and outputs a negative value here: http://en.wikipedia.org/w/index.php?title=Calcitriol&direction=next&oldid=-71374766

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9401459..03cab3e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -247,7 +247,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   redirect from Special:Contributions/newbies for backwards compatibility
 * (bug 7671) Observe canonical media namespace prefix in Linker::formatComment
 * Added js variable wgCurRevisionId to the output
-* Added js variable wgOldId which shows the oldid when viewing an old revision
 * (bug 8141) Cleanup of Parser::doTableStuff, patch by AzaTht
 * (bug 8042) Make miser mode caching limits settable via $wgQueryCacheLimit
   instead of hardcoding to 1000

diff --git a/includes/Skin.php b/includes/Skin.php
index 45e8f28..28945a7 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -285,7 +285,6 @@ class Skin extends Linker {
                        var wgTitle = "' . Xml::escapeJsString( $data['titletext'] ) . '";
                        var wgArticleId = ' . (int)$data['articleid'] . ';
                        var wgCurRevisionId = ' . ( int ) $data['currevisionid'] . ';
-                       var wgOldid = ' . ( int ) $data['oldid'] . ';
                        var wgIsArticle = ' . ( $data['isarticle'] ? 'true' : 'false' ) . ';
                
                        var wgUserName = ' . ( $data['username'] == NULL ? 'null' : ( '"' . Xml::escapeJsString( $data['username'] ) . '"' ) ) . ';
@@ -300,7 +299,7 @@ class Skin extends Linker {
        function getHeadScripts() {
                global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType, $wgStyleVersion;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
-               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle, $wgRequest;
+               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
 
                $ns = $wgTitle->getNamespace();
                $nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
@@ -318,7 +317,6 @@ class Skin extends Linker {
                        'titletext' => $wgTitle->getText(),
                        'articleid' => $wgTitle->getArticleId(),
                        'currevisionid' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
-                       'oldid' => $wgRequest->getVal( 'oldid' ),
                        'isarticle' => $wgOut->isArticle(),
                        'username' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
                        'userlang' => $wgLang->getCode(),

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 0249e7d..ab0e4b1 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -204,7 +204,6 @@ class SkinTemplate extends Skin {
                $tpl->set( 'titletext', $this->mTitle->getText() );
                $tpl->set( 'articleid', $this->mTitle->getArticleId() );
                $tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
-               $tpl->set( 'oldid', $oldid ? $oldid : 0 );
 
                $tpl->set( 'isarticle', $wgOut->isArticle() );